bitkeeper revision 1.1112 (40fd0836lqaEEouEUZVptMdQ6ZaPIQ)
authorcl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Tue, 20 Jul 2004 11:55:34 +0000 (11:55 +0000)
committercl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Tue, 20 Jul 2004 11:55:34 +0000 (11:55 +0000)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into freefall.cl.cam.ac.uk:/local/scratch/cl349/xeno.bk-ptrw

1  2 
xen/arch/x86/memory.c

Simple merge